Backport "Revert "Include top-level symbols from same file in outer ambiguity error"" #18182
+7
−54
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.